-
Notifications
You must be signed in to change notification settings - Fork 387
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
OTA-1010: extract included manifests with net-new capabilities #1958
base: master
Are you sure you want to change the base?
Conversation
@hongkailiu: This pull request references OTA-1010 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. In response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: hongkailiu The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
ad75be6
to
38aeb1d
Compare
@hongkailiu: This pull request references OTA-1010 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
69216c5
to
916427e
Compare
@hongkailiu: This pull request references OTA-1010 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
manifestInclusionConfiguration.Overrides, | ||
true, | ||
) | ||
// update manifest is enabled, no need to check |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, but with IncludeAllowUnknownCapabilities
, aren't the ones that fail the ones we can ignore? I'd guess they meant "not even with all these new caps enabled will this manifest get included". The ones we'll implicitly enable caps for are the ones that fail to get included if we apply the current caps, but which do get included if we allow new caps, and which match SameResourceID
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function is refactored from this one in CVO: /~https://github.com/openshift/cluster-version-operator/blob/e90705bb5457b2b9d449b4377036c3de6617ebb6/pkg/payload/payload.go#L247-L252
My understanding is very weak on this function (although i have read it a couple of times already).
hmm, but with IncludeAllowUnknownCapabilities, aren't the ones that fail the ones we can ignore?
No. Passed ones (updateManErr == nil
in the next line) are ignored. The manifests that are included on the cluster wont generate new implicitly enabled capabilities.
916427e
to
27e03eb
Compare
@hongkailiu: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
Before this pull, we enabled three 3 net-new capabilities for 4.13 clusters:
oc/pkg/cli/admin/release/extract_tools.go
Lines 1241 to 1252 in e005223
Now the capabilities for the incoming release is calculated with the function from CVO based on the manifests from the current release and the ones from the incoming release.
To fit the current code that had
TarEntryCallback
already, the above logic is implemented via aManifestReceiver
that works between the upstreamTarEntryCallback
and the downstreammanifestsCallback
. WithneedEnabledCapabilities
, it tells the receiver that themanifestsCallback
is called with enabled capabilities computed. The price is thatmanifestsCallback
is called only after it collects all the manifests from the upstream.